A conflict occurs when a file to be overwritten may contain important information which will be lost.
This can happen when two files were both changed since the last time they were synchronized. The changes in each of the two files may be different, and both sets of changes may be important.
A conflict can also occur when a file of one type will replace a file of a different type, using the same name. For example, if a word-processing file called "My Stuff" is in a folder, and an spreadsheet file of the same name is created in the folder to be synchronized, both files contain different, useful information, but they happen to have the same name.
Synchronize! gives you the flexibility to choose whether you should be notified of these situations, and what action to take if they occur. Choose "Conflicts" from the Options menu to change the settings for the Synchronize! settings document.
Most of the settings are self-explanatory. When you choose "Move the older file to the Conflicts Folder", the older file that would normally be overwritten in a synchronization will be moved to a folder named "Conflict Folder". This folder will always be inside the folder you select as the folder to be synchronized. It will be created if it doesn't exist.
